projects / gtk4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 11ca120)
Cancel drags when the grabs get broken. Fixes bug #333056:
authorFederico Mena Quintero <federico@novell.com>
Tue, 7 Mar 2006 17:48:07 +0000 (17:48 +0000)
committerFederico Mena Quintero <federico@src.gnome.org>
Tue, 7 Mar 2006 17:48:07 +0000 (17:48 +0000)
2006-03-07  Federico Mena Quintero  <federico@novell.com>

Cancel drags when the grabs get broken.  Fixes bug #333056:

* gtk/gtkdnd.c (gtk_drag_selection_received): The time argument is
a guint, not guint32.
(gtk_drag_source_event_cb): Return gboolean, not gint.
(gtk_drag_anim_timeout): Likewise.
(gtk_drag_motion_cb): Likewise.
(gtk_drag_key_cb): Likewise.
(gtk_drag_button_release_cb): Likewise.
(gtk_drag_abort_timeout): Likewise.
(gtk_drag_begin_internal): Connect to "grab-broken-event" on the
ipc_widget.
(gtk_drag_source_info_destroy): Disconnect from the
"grab-broken-event" callback.
(gtk_drag_end): Likewise.
(gtk_drag_grab_broken_event_cb): New callback.  We cancel the drag
if the grab was broken and not regrabbed by the DnD code.

2006-03-07  Federico Mena Quintero  <federico@novell.com>

* gtk/gtkfilechooserdefault.c (shortcuts_button_press_event_cb):
Hack to let the treeview's button-press-event handler run before
ours.  This lets the selection be updated before we pop up a
context menu.

ChangeLog patch | blob | history
ChangeLog.pre-2-10 patch | blob | history
gtk/gtkdnd.c patch | blob | history
gtk/gtkfilechooserdefault.c patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 4fe20bebbf7d5c84959f850748fbe8e912f866ed..0c69b4e174e141e7ba904d8155bc69198f683c5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2006-03-07  Federico Mena Quintero  <federico@novell.com>
+
+       Cancel drags when the grabs get broken.  Fixes bug #333056:
+
+       * gtk/gtkdnd.c (gtk_drag_selection_received): The time argument is
+       a guint, not guint32.
+       (gtk_drag_source_event_cb): Return gboolean, not gint.
+       (gtk_drag_anim_timeout): Likewise.
+       (gtk_drag_motion_cb): Likewise.
+       (gtk_drag_key_cb): Likewise.
+       (gtk_drag_button_release_cb): Likewise.
+       (gtk_drag_abort_timeout): Likewise.
+       (gtk_drag_begin_internal): Connect to "grab-broken-event" on the
+       ipc_widget.
+       (gtk_drag_source_info_destroy): Disconnect from the
+       "grab-broken-event" callback.
+       (gtk_drag_end): Likewise.
+       (gtk_drag_grab_broken_event_cb): New callback.  We cancel the drag
+       if the grab was broken and not regrabbed by the DnD code.
+
+2006-03-07  Federico Mena Quintero  <federico@novell.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_button_press_event_cb):
+       Hack to let the treeview's button-press-event handler run before
+       ours.  This lets the selection be updated before we pop up a
+       context menu.
+
 Tue Mar  7 17:16:34 2006  Tim Janik  <timj@gtk.org>
 
        * configure.in: depend on glib-2.10.1.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4fe20bebbf7d5c84959f850748fbe8e912f866ed..0c69b4e174e141e7ba904d8155bc69198f683c5d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,30 @@
+2006-03-07  Federico Mena Quintero  <federico@novell.com>
+
+       Cancel drags when the grabs get broken.  Fixes bug #333056:
+
+       * gtk/gtkdnd.c (gtk_drag_selection_received): The time argument is
+       a guint, not guint32.
+       (gtk_drag_source_event_cb): Return gboolean, not gint.
+       (gtk_drag_anim_timeout): Likewise.
+       (gtk_drag_motion_cb): Likewise.
+       (gtk_drag_key_cb): Likewise.
+       (gtk_drag_button_release_cb): Likewise.
+       (gtk_drag_abort_timeout): Likewise.
+       (gtk_drag_begin_internal): Connect to "grab-broken-event" on the
+       ipc_widget.
+       (gtk_drag_source_info_destroy): Disconnect from the
+       "grab-broken-event" callback.
+       (gtk_drag_end): Likewise.
+       (gtk_drag_grab_broken_event_cb): New callback.  We cancel the drag
+       if the grab was broken and not regrabbed by the DnD code.
+
+2006-03-07  Federico Mena Quintero  <federico@novell.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_button_press_event_cb):
+       Hack to let the treeview's button-press-event handler run before
+       ours.  This lets the selection be updated before we pop up a
+       context menu.
+
 Tue Mar  7 17:16:34 2006  Tim Janik  <timj@gtk.org>
 
        * configure.in: depend on glib-2.10.1.
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 7e334c7fe73491788412d5c88bc092eef16ee226..9d97c21c8b32b06cd6182220dbc077925eb677ec 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -210,7 +210,7 @@ static gboolean      gtk_drag_highlight_expose   (GtkWidget      *widget,
 
 static void     gtk_drag_selection_received     (GtkWidget        *widget,
                                                 GtkSelectionData *selection_data,
-                                                guint32           time,
+                                                guint             time,
                                                 gpointer          data);
 static void     gtk_drag_find_widget            (GtkWidget        *widget,
                                                 GtkDragFindData  *data);
@@ -254,7 +254,7 @@ static void gtk_drag_drop_finished             (GtkDragSourceInfo *info,
 static void gtk_drag_cancel                    (GtkDragSourceInfo *info,
                                                guint32            time);
 
-static gint gtk_drag_source_event_cb           (GtkWidget         *widget,
+static gboolean gtk_drag_source_event_cb       (GtkWidget         *widget,
                                                GdkEvent          *event,
                                                gpointer           data);
 static void gtk_drag_source_site_destroy       (gpointer           data);
@@ -263,7 +263,7 @@ static void gtk_drag_selection_get             (GtkWidget         *widget,
                                                guint              sel_info,
                                                guint32            time,
                                                gpointer           data);
-static gint gtk_drag_anim_timeout              (gpointer           data);
+static gboolean gtk_drag_anim_timeout          (gpointer           data);
 static void gtk_drag_remove_icon               (GtkDragSourceInfo *info);
 static void gtk_drag_source_info_destroy       (GtkDragSourceInfo *info);
 static void gtk_drag_add_update_idle           (GtkDragSourceInfo *info);
@@ -273,16 +273,19 @@ static void gtk_drag_update                    (GtkDragSourceInfo *info,
                                                gint               x_root,
                                                gint               y_root,
                                                GdkEvent          *event);
-static gint gtk_drag_motion_cb                 (GtkWidget         *widget, 
+static gboolean gtk_drag_motion_cb             (GtkWidget         *widget, 
                                                GdkEventMotion    *event, 
                                                gpointer           data);
-static gint gtk_drag_key_cb                    (GtkWidget         *widget, 
+static gboolean gtk_drag_key_cb                (GtkWidget         *widget, 
                                                GdkEventKey       *event, 
                                                gpointer           data);
-static gint gtk_drag_button_release_cb         (GtkWidget         *widget, 
+static gboolean gtk_drag_grab_broken_event_cb  (GtkWidget          *widget,
+                                               GdkEventGrabBroken *event,
+                                               gpointer            data);
+static gboolean gtk_drag_button_release_cb     (GtkWidget         *widget, 
                                                GdkEventButton    *event, 
                                                gpointer           data);
-static gint gtk_drag_abort_timeout             (gpointer           data);
+static gboolean gtk_drag_abort_timeout         (gpointer           data);
 
 /************************
  * Cursor and Icon data *
@@ -1444,7 +1447,7 @@ gtk_drag_dest_find_target (GtkWidget      *widget,
 static void
 gtk_drag_selection_received (GtkWidget        *widget,
                             GtkSelectionData *selection_data,
-                            guint32           time,
+                            guint             time,
                             gpointer          data)
 {
   GdkDragContext *context;
@@ -2240,6 +2243,8 @@ gtk_drag_begin_internal (GtkWidget         *widget,
   info->start_x = info->cur_x;
   info->start_y = info->cur_y;
 
+  g_signal_connect (info->ipc_widget, "grab-broken-event",
+                   G_CALLBACK (gtk_drag_grab_broken_event_cb), info);
   g_signal_connect (info->ipc_widget, "button_release_event",
                    G_CALLBACK (gtk_drag_button_release_cb), info);
   g_signal_connect (info->ipc_widget, "motion_notify_event",
@@ -3427,7 +3432,7 @@ gtk_drag_drop (GtkDragSourceInfo *info,
  * Source side callbacks.
  */
 
-static gint
+static gboolean
 gtk_drag_source_event_cb (GtkWidget      *widget,
                          GdkEvent       *event,
                          gpointer        data)
@@ -3559,7 +3564,7 @@ gtk_drag_selection_get (GtkWidget        *widget,
     }
 }
 
-static gint
+static gboolean
 gtk_drag_anim_timeout (gpointer data)
 {
   GtkDragAnim *anim = data;
@@ -3649,6 +3654,9 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info)
     g_object_unref (info->widget);
 
 
+  g_signal_handlers_disconnect_by_func (info->ipc_widget,
+                                       gtk_drag_grab_broken_event_cb,
+                                       info);
   g_signal_handlers_disconnect_by_func (info->ipc_widget,
                                        gtk_drag_button_release_cb,
                                        info);
@@ -3810,6 +3818,9 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
   gdk_display_keyboard_ungrab (display, time);
   gtk_grab_remove (info->ipc_widget);
 
+  g_signal_handlers_disconnect_by_func (info->ipc_widget,
+                                       gtk_drag_grab_broken_event_cb,
+                                       info);
   g_signal_handlers_disconnect_by_func (info->ipc_widget,
                                        gtk_drag_button_release_cb,
                                        info);
@@ -3870,7 +3881,7 @@ gtk_drag_cancel (GtkDragSourceInfo *info, guint32 time)
  *   results:
  *************************************************************/
 
-static gint
+static gboolean
 gtk_drag_motion_cb (GtkWidget      *widget, 
                    GdkEventMotion *event, 
                    gpointer        data)
@@ -3906,7 +3917,7 @@ gtk_drag_motion_cb (GtkWidget      *widget,
 #define BIG_STEP 20
 #define SMALL_STEP 1
 
-static gint 
+static gboolean
 gtk_drag_key_cb (GtkWidget         *widget, 
                 GdkEventKey       *event, 
                 gpointer           data)
@@ -3982,6 +3993,26 @@ gtk_drag_key_cb (GtkWidget         *widget,
   return TRUE;
 }
 
+static gboolean
+gtk_drag_grab_broken_event_cb (GtkWidget          *widget,
+                              GdkEventGrabBroken *event,
+                              gpointer            data)
+{
+  GtkDragSourceInfo *info = (GtkDragSourceInfo *)data;
+
+  /* Don't cancel if we break the implicit grab from the initial button_press.
+   * Also, don't cancel if we re-grab on the widget or on our IPC window, for
+   * example, when changing the drag cursor.
+   */
+  if (event->implicit
+      || event->grab_window == info->widget->window
+      || event->grab_window == info->ipc_widget->window)
+    return FALSE;
+
+  gtk_drag_cancel (info, gtk_get_current_event_time ());
+  return TRUE;
+}
+
 /*************************************************************
  * gtk_drag_button_release_cb:
  *     "button_release_event" callback during drag.
@@ -3990,7 +4021,7 @@ gtk_drag_key_cb (GtkWidget         *widget,
  *   results:
  *************************************************************/
 
-static gint
+static gboolean
 gtk_drag_button_release_cb (GtkWidget      *widget, 
                            GdkEventButton *event, 
                            gpointer        data)
@@ -4013,7 +4044,7 @@ gtk_drag_button_release_cb (GtkWidget      *widget,
   return TRUE;
 }
 
-static gint
+static gboolean
 gtk_drag_abort_timeout (gpointer data)
 {
   GtkDragSourceInfo *info = data;
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index d474c5a900fe849ea2c8739a9cb622a39f958e0e..4843f28b253cdfecfa2b46f0d9db235d0c5c14ad 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3095,9 +3095,22 @@ shortcuts_button_press_event_cb (GtkWidget             *widget,
                                 GdkEventButton        *event,
                                 GtkFileChooserDefault *impl)
 {
+  static gboolean in_press = FALSE;
+  gboolean handled;
+
+  if (in_press)
+    return FALSE;
+
   if (event->button != 3)
     return FALSE;
 
+  in_press = TRUE;
+  handled = gtk_widget_event (impl->browse_shortcuts_tree_view, (GdkEvent *) event);
+  in_press = FALSE;
+
+  if (!handled)
+    return FALSE;
+
   shortcuts_popup_menu (impl, event);
   return TRUE;
 }
@@ -3643,9 +3656,19 @@ list_button_press_event_cb (GtkWidget             *widget,
                            GdkEventButton        *event,
                            GtkFileChooserDefault *impl)
 {
+  static gboolean in_press = FALSE;
+  gboolean handled;
+
+  if (in_press)
+    return FALSE;
+
   if (event->button != 3)
     return FALSE;
 
+  in_press = TRUE;
+  handled = gtk_widget_event (impl->browse_files_tree_view, (GdkEvent *) event);
+  in_press = FALSE;
+
   file_list_popup_menu (impl, event);
   return TRUE;
 }
Unnamed repository; edit this file 'description' to name the repository.